Make the xenfb tools an optional part of the build, as they introduce new

dependencies (libvncserver and libsdl devel packages).  Enable them with
XENFB_TOOLS=y.

Signed-off-by: Ewan Mellor <ewan@xensource.com>

diff --git a/Config.mk b/Config.mk
index 364c7231c4b538511eac77dc5e9fbc0550510bd2..08873d69d473f179c3f06806bee9887eb7b4aef3 100644 (file)
--- a/Config.mk
+++ b/Config.mk
@@ -69,8 +69,8 @@ ACM_DEFAULT_SECURITY_POLICY ?= ACM_NULL_POLICY
 
 # Optional components
 XENSTAT_XENTOP ?= y
-
 VTPM_TOOLS ?= n
 LIBXENAPI_BINDINGS ?= n
+XENFB_TOOLS ?= n
 
 -include $(XEN_ROOT)/.config

diff --git a/tools/Makefile b/tools/Makefile
index 29ce67dfe2675bfab554ed6be49041160ed17308..b4156fc90435e496888824aa41c0f68220d939fe 100644 (file)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -19,7 +19,7 @@ SUBDIRS-y += xenstat
 SUBDIRS-y += libaio
 SUBDIRS-y += blktap
 SUBDIRS-y += libfsimage
-SUBDIRS-y += xenfb
+SUBDIRS-$(XENFB_TOOLS) += xenfb
 SUBDIRS-$(LIBXENAPI_BINDINGS) += libxen
 
 # These don't cross-compile

diff --git a/tools/check/Makefile b/tools/check/Makefile
index 4605c03c392ffa3e64aac3d15d419c326109f3ca..0b87aea259c64c9829f8c9103d7a16ab1ebf2d51 100644 (file)
--- a/tools/check/Makefile
+++ b/tools/check/Makefile
@@ -1,3 +1,5 @@
+XEN_ROOT = ../..
+include $(XEN_ROOT)/tools/Rules.mk
 
 .PHONY: all
 all: build
@@ -5,7 +7,7 @@ all: build
 # Check this machine is OK for building on.
 .PHONY: build
 build:
-       ./chk build
+       XENFB_TOOLS=$(XENFB_TOOLS) ./chk build
 
 # Check this machine is OK for installing on.
 # DO NOT use this check from 'make install' in the parent
@@ -13,7 +15,7 @@ build:
 # copy rather than actually installing.
 .PHONY: install
 install:
-       ./chk install
+       XENFB_TOOLS=$(XENFB_TOOLS) ./chk install
 
 .PHONY: clean
 clean:

diff --git a/tools/check/check_libvncserver b/tools/check/check_libvncserver
index dc9ed9153d7923365ccace71820d61e8b2b030cf..69efd063b39ab171cd082867983c08a3fdf01caa 100755 (executable)
--- a/tools/check/check_libvncserver
+++ b/tools/check/check_libvncserver
@@ -1,6 +1,12 @@
 #!/bin/sh
 # CHECK-BUILD CHECK-INSTALL
 
+if [ ! "$XENFB_TOOLS" = "y" ]
+then
+    echo -n "unused, "
+    exit 0
+fi
+
 RC=0
 
 LIBVNCSERVER_CONFIG="$(which libvncserver-config)"

diff --git a/tools/check/check_sdl b/tools/check/check_sdl
index 783291035530fad319789387a9569d7e8b248a2e..aac0130fe338bbc1e5e3d20e20d0706f36a22812 100755 (executable)
--- a/tools/check/check_sdl
+++ b/tools/check/check_sdl
@@ -1,6 +1,12 @@
 #!/bin/sh
 # CHECK-BUILD CHECK-INSTALL
 
+if [ ! "$XENFB_TOOLS" = "y" ]
+then
+    echo -n "unused, "
+    exit 0
+fi
+
 RC=0
 
 SDL_CONFIG="$(which sdl-config)"